redid some lost changes