Continuation of the code changes to make all improvements DIA