Move function changed again