Log handling - commented future code