Temp commit in temp branche
[Fix some bugs]