updates from class 3/12