modifications and additions to the helper