Merging Ketty's new maps

to the main branch