czwang's change