Updating survey demo to new core