re-added some lost changes