Adding in changes for logging