Improved client