Feature/book 608 fdbck