updating my params with juergens params and other way around 4 TODOs left