yutang's first modification.