LPS-51789 Reuse existing logic?