Added if and or exercise