many updates to classes 1 and 2