Second change by MB on Paul's repos