Feature/book 625 612

Do we need the logging?