updated to work with buildable refactor