More changes to proof of concept