updating MP/wip branch from BasalGanglia ...