draft version modules 5,6,7 + expanded risks