Updated to make tests pass