some changes after further tests.