updated to work with new buildable