Adding Necessary Changes