Much better, not perfect but good enough