Merge of Jenny's changes.