Apply warner's comments