restored some lost changes