added steven's stockholm changes