Tested: new implementation tested