Started working on the new 1.1 version of MAP