Even more reliable maps... all test cases working