updated to include conditionals set to variables