Remove hardcode for 0. Add moving if position are not consistent