LPS-48598-Refactored