Changes from demo