Add whiskey_disk and spring back in