Updated lesson logic