Update after some initial testing.