This is still rough, but it is a little better.