...refactoring and issues resolution: WIP