change yes-or-no-p to y-or-n-p