updated and fixed after test run