Pulling in some changes to the demo