Updated for new workshop