edits 11-24