Updated to newest demo code.