Re-added debug feature