Done, but since these vars are now dependeny on parameters into newTransport, their defs needed to be moved inside that function.