Improvements to proof of concept