Changes from the demo