Updates to hash sheesh post courtesy of Steph