Made changes to the Code