Changes to get SP on board