Changes in logic here?  Are they tested?