Thesis: full revision