updated build to reflect Carl's changes