Add Commit and Fix Bug