changed conventions, tests are not done yet