Logs fix
logs refactor