Update with more lessons learned