Improved client application