made changes to classes