Debugged bug 1 and 3