include debugging
merged MMs additions