Final version fixed with mentor