changes to move/resize handling