merge from thesis_structure