Fixed up the CGI