More work on tutorial 2