Adapted changes to couteau