more comprehensive build