more work on WAPM v2