Updated for his comments