Updated necessary changes