Hotfix/85 course controller