merge Hugh's change