Enhance 4 improve settings mechanism