Changes to enable turning in the future