debug changes -azeem&pradeep