should have used refactor...