updates for v20