update by lordan