updated after class