Fixing the good stuff with more stuff