Updating content per KAeti's notes.