re-factored demo tasks