Made minor changes before showing client