Updates from class 2