Thesis updated