MAP-900: finishing touches (2)