Tutorial 6 improvements
Merge upstream