Slight changes and few more demos.