another round of edit changes