Feature1 - Made some changes