Refactored 35 and added test case.