Final touces to the PoC