Change heading
Re-organize pins