Improve Controller and Parameters