issues 22,23,24 fixed
issues 22,23,24 fixed