added some edits