case 3654 - Another set of code refactor.