Updated and completed PoC