Fixing Everything the right way