merging Chris changes