minor tweaks to POC