Updated routing and lesson selection