Added if statements