Re-working some parallel demos