Udated to use Journal class