updated with both patches