Merged workshops
Updated workshop details