Thesis Updated