Adding some more bug 2!