Partial Merge of Tristans Branch