Tweaked the client