Added updates from pre-dry-run exercise