debug feature added