again some refactorings, step by step identification process comes closer to working...