edits from 10/24