Not perfect, but it IS much better than before...