Journal and code updates