merge from thesis/book