adapted demo-web for issue #3