update from Fergus