deps, updated helpers