Incorporate Brian's suggestions