improved heading catch-up