Changes based on initial tests with hardware