journal edit
Merge branch 'journal'