Sept 20/2012 by Adam: commit changes mostly in the MINIM version