Massive improvements to diagonals, very few left to do!