more changes to the class