Use my fork of the helpers, for debugging