commenting out spa stuff