Redployed with Sinon change