Changed p_vectors to s_vectors for spherical vectors.