[POC] refac