Fixing 'er up