Logging
Tidy up and add zone serial number