much better but still work to do