Final changes for demo to be functional