fixed & update