Added if statement back