Change l59 if to or instead of and, remove echo