add Nick's suggestions