changes proposed by Aaron Helsinger and GENI