gonna change todo into spa