updated to combined build process