Made changes to update the code