PoC final commit after demo