updating with Tim's comments