Logging fixed / implemented properly
Logging fixed / implemented properly