Added matching if/else block