Reorganised the parameters #41