More progress, but still not ideal