Made some changes for testing.