restructered stuff to save wireless bandwideth