Simulation and actual demo code streamlined.