Fixing Bugs for trying again