updated to reflect refactor