merged some lost changes