updates for public refactor