Reviewed version

sent to JDL