refactored courses