Added debug feature