Changes for revised def 3.2. Also implementation of specifying policies in program.