Feature/book 604