Fixed Bug 1, bug 3 still here