refactored to handle new m2nodehandler