reorganised the demo a little