Adjusted a couple things for demo