Demo Update 1

Made demo more user friendly.