Finish the first part of tutorial 2