Getting better, still not quite there