Updating demo so that it works cleanly with Anvil