added movement with return - return is buggy though.