Thesis update
Merge