merge changes made for mindmup