Simplified code.
Resuing existing helper.