Maps modification

As the title says.