updated for the demo