Demo added.
Much more reobust.