use WAY_BITS in appropriate locations