Implement rework on past work +review CR-TEST-123