Fixed bug 2 from Tim, added bug 2 for Tim