Big performance patch on diagonals.