Fergus  Fixed changes