Epsilon and sigma now only in cuboids and spheres.