Switched to using heading anchors