Added toggle for enforcing moves