Adding back some lost changes