restructured as a singe course