it seems to work, ready the tests