added Jonathan's stuff