Duc's commit