fix bug and updating.