Added if/else