Refining journal logic
merged