First pass updates completed to tutorial 5 - composition types