new update for class.waffle and some examples