Added if condition