oisin's commit

Oisin's change