Updated Thesis