renamed spherical to toroidal