LPS-52122 - Change of variables names and little source format.