echosoft works again (using 1 set of unified generated functions)