added spheres
fixed merge