Speed refactor