restructered stuff to save wireless bandwideth
Something about merge conflict