now must add boolean logic