Incorporate Marc Edwards feedback.