refactor to fix 2