Lots of updates to lesson 06