More update for exercise2