updated with SPA's