Improved spiro2.