Thesis 2018- term 2