Updates from class 6