working much better now