Update to handle SCOF