Thesis final update