Fixing Bugs 1.0