Have new implementation, going to get rid of redundant code
Have removed now redundant functions
Tidied slightly
Updated with new formulation
removes redundant lines
Merge branch '16332' into 16333
adds automatic scaling and fixes bug in init