mods to use new xl*_go packages