Enhance granularity on what I want to debug for the moment by changing