Made changes like described in tutorial day 4