Address Tim's comments