Add untested demo changes