Refined the PoC