updated build for internal use