Updated with new demos