Fixing my Autopilot - Part Two