[#60826864] 'Success on your own terms' refactoring.
[#60826864] 'Success on your own terms' tweaks.