Last validation before 2.0