tweaked for the demo