Refactored upto the selecting variables page
Refactored upto the selecting variables page