updated after first class