Magical optimisation implemented. @donaldacmartin fault I got unsolvable git collisions