Some changed made