Code optimization.
Implement ,
Works with even more tests.