colin master commit

this is colin's version for the master