Update And Fix Bug