Added more variables and conditions

Added more variables and conditions