Updating code further