Made more effecient