more robust demo mode
build