Code #045 Improved