Updated lessons and optimization