Updated the thesis