refactor changes with Anthony