Persistent. Comments added. Layout edits.