Working in the improvements. Incident#1574