Much better, still needs work