Added 2nd workshop and tweaks