finalised maps from somewhere else
fixed merge conflicts