Another edit
More work on tutorial 2