Some changed made.