Waffle upgrade