8.6-before
refactor
replace hash with object