commit #2: performance improvment