Redid the WCF