made #99 implementation + lesson switch smoother