passing rightHash down was just adding complexity