Added Team 2's code