updated yike's change