Added if test