adding some more if/else checks