Add a check for when moving