many changes as a reflect of moving towards SPA