Tiny bit more efficient