Added variables and testing conditional