Batch update.
Including edits based on Patty's comments.
Patty's edits 2.