Taking care of Chad's comments