[TECHNICAL SUPPORT] LPS-30715 

Hi Dani,

I've refactored the code as we discussed and tested it with my basic test cases to verify it's working.

Regards,
Vilmos