Client a bit refactored and fixed
Client a bit refactored and fixed
Client a bit refactored and fixed