Heading fix, Made AP a tiny better.