Fixing Bugs Done