new version, add workshop support