Guillaume's changes