* yet another try now this time with GVM
* fixed merge conflict