Temporary swtich back to non-entity movement for working purposes