Updating the code for issue