Really much better hash management