Initial revision of all demo code available