Updates
Thesis
Merge