Fixed the rotation angle and included some different headings