Working a little better now