gfuncs now also added to function map