Make-a-Map version 3