Improvements and parameters changes