added mitchell's suggestions