Changes to add heading control