Reworked to use spas