Updating to match workshop