Simplifying workshop slightly