modify bug &&->||,and adjust format