Debugged and tested. Works better. Keep evolution of test cases.