Improved WCE & spider'ed Clementi (incomplete)