Added if clause