Jeremie's comments and Changes