Added changes from the demo