LPS-32186

Hi @giros,

please review my changes and try to do the re-factor we have talked about.

thanks,
Dani