the whole thesis is restructure