updated to work with buildable