merging Tim's changes form HEAD