Pass hirono spec
Pass hirono spec
Refactoring