o.c.cagateway: changes from matthias