Final workshop changes.