More changes from tutorial