some edits have been done