update and simplify analysis