idhashpair added, changes based on this