Fn naming changes
demo removed, new example added.