Final changes for fully working demo