more work on wp mapper