Tweaked Estimator form design a bit more