Debug part improved