tweak debug as per jia's request