Removed change I did not want to push yet from DGLM  (part of larger change I keep in my ws for now)