Orc review

it is better to unify this