update demo to match master