Updates for exercise08