Update for hashing and .+ x changes