Updates after class 04 08