Change Log:
Made some changes.