2nd change by MB on Michael's repos