Edits based on Chad.