Doing Repairs The Right Way