modify the thesis according to Mark's suggestions