Moved bundleClient function def