WCMS-36 this being the helper...