New Step into new functionalities, all test passed.
//TODO test & refactoring obsolete code.