Simplified heading logic