Rewrite the feature to behave more like peoples' expectations