back to square with old map implementation