Address tsdeng's comments