Fix eval branch. Course mode fix