We can reuse the same variable for advanced that we use in basic. When applying, use the correct varaible.
We can reuse the same variable for advanced that we use in basic. When
applying, use the correct varaible.


git-svn-id: 0f3f1c46c6da7ffd142db61e503a7ff63af3a195@20804 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

jordemort/e17,jordemort/e17,jordemort/e17