Update to pass existing tests