Bug fixed and update new code