Incorporating Jeff suggestions.