Changing the order of the tests and changing the way to instantiate the effective date.