Changes in response to problem tracker 1234

Updated files needed in response to tracker 1234, .....