Forgot to add the refactored file