fix2: add fetaure: more correct