updates to work in class