Added debug toggling