more work on property map