Changes for tutorial 5.