Merged changes
Journal script update
Put everything in one file