All of bug fix 2