Added two variables and conditions

Added two variables and conditions and test successfully