stop using inner_hash and use simple hashes