some edits please check