some changes made as per Satish request