Continuing to extract code from Discovery