Adding Guillaume's changes