Added some bugs