Update  Fance's code  From master