everything done for bug 2