some edits from Review