integrate remark from Cedric