re-adding some edits