Feature/book 960