improved speed ofof lookup