Added another debug feature