Merged updated move class