Added if/else

Added if/else