updated together after class