Added debug mode back