Thesis changes based refactor in process