Added Jonathan's suggestions