Forgot to finish refactoring