SPA one step further
before 3.3.2