And the same, but cleaned up a bit.