Latest updates to Demo