Modify for latest coursework