Few modifications to workshop.