working much better