Tutorial 6 improvements