reducing bandwidth & fixing refs :)