Refactor for nozomi