Bringing the rest of spencers changes in