some changes after test-run