Update to always run, and tune some of the selectors