Re-merging the helpers