Replaced the jitter in the N^{-1} with block-matrices. About 10x slower, but completely general