WIP : removing previous abstraction