Final commit for the back-end. All test cases passed.