Update few codes