more SPA work