added local changes to get POC working