Added variables and tested

Added variables and tested