update By jack 20140605