Simplify logic.  Increase logging.