Modify for workshop