Before point refactor