Add back the calls to move