Removed regex, added courses