Tweaked demo