updated for SPA's