waffle related changes