adaptions to new gv version