Update for Primary Extension.  Added better logging.