changed some names
moved move method to top