Improved modified-moment-singularity method.