Added some bugs
Bug Fixed