Modify the bug and some of the other