Final version before testing.