#213 changes relating to workshops