added journal entries
fixed merge issue