[CDA-55]: new approach - WIP