done, passes test now