a bit more work on migrating away from oldmap