more work on WAMPv2