Merged two demos, small improvements