Updates to Dilutions2 code to make it universal