Refactored 33 and added test case.