Now passes all tests.