Added more if/else messages