Improve moving off logic