Fixing the POC to work.