changes to move class