change to if/else as suggested