wip on SPA conversion