Address TD's comments