improve CGI