More work on the tutorial