Governmentconvoy rework, fix #9