Make server much more effecient