Re-enabling helpers, tweaking strategy