Feature/book 615 task