Tuned parameters
Fixed conflicts