Second pass; fixed measure calculation results and patient builder tabbing (dirty)