Behavior improvements for demo purposes