working version, passing a new unit test