Updated castleHeading class