Correcting some point in mediation and adding 2nd version of our B2B Service