change boolean operator to &&