adding better parsing info