Made changes that reflect the merge of the experiment repo