now with cgi support