merged hong's change