Merge of Rich T-W's changes