Reorganized measmaps + presentation