- added logic to BooleanValueCalculator