Slight changes to Automode