ashwin/dc| #2121 | some changes in script