Refactoring + added journal