Adding back more of the features from tuning.