demo changes
mereged demo with other demo code