added some necessary changes.