Previous commit works, now trying to simplify analysis