change logic for nahao and quhao