Feature/book 578