added some recent work at class