merge and re-inclusion of Map Advanced