changes from demo