Added changes up to 1st demo