Implement #86 Re-ajust logging