Commit integrated with some bugs