Now passes tests.