if/else order change