demo changes and additions to the helpers