Revised version from DII project