More changes to the proof of concept program