updated in order for the code and the tests to work