update by jack 20140620