update by jack 1:07 15/12/2557