modified how map-notifies are generated; ms works