Slow refactor

yes