Take care of dan's comments