add debug codes more