Merge Bastien's Changes