improved client buffer