After Comments from D.W