fixing performance issue on client; reducing bandwidth