Working on the debug mode