Tweaked demo to allow for editable models