OP is dead on with Innin/Yonin. I support his suggestions 100%