Yes, all of the wifi stuff we add in the future will be only possible on comcast-provided wireless gateways (XB2/XB3). We have some other nifty ideas that would use our gateways too. Most of the existing stuff I mentioned is not specific to comcast-provided devices, or wireless gateways.