Merging in Tyler's changes