[Client] main was improved