Tutorial 2.1 improvements