client: preparation to production