[issue #1] final demo adaptions