<<<<<<< HEAD
=======
>>>>>>> 64c0b743 (Reorganises internal state)
<<<<<<< HEAD ======= >>>>>>> 64c0b743 (Reorganises internal state)