Adding some bugs