Restored some commented updates