Improved client/server