Fixed up demo a bit