update from MPN exp branch