Tutorials 1-3 improved