Changed one of the conditions and added a one

Changed one of the conditions and added another condition and tested it
successfully