New changes for iteration 3 IDP