LPS-44189

Heya Iliyan,
I made some changes (I didn't delete the DEMO commit yet), but I just wanted you to check the changes to see if everything looks okay.

Thanks Iliyan!