Works better, still not perfect, however.