Update to boder code for logging