Some enhancements - fitting parameters are remebered