Made more efficient