Made more efficient.