modifs by guillaume !