Also, could you add/update a unit test for this method?