Added nozomi-specific stuff