Update to fit latest scaffold.