exact diagonal working again, bottleneck fixed